速報APP / How to resolve conflict

How to resolve conflict